Manual merge of version 6.26.0-2+rpi1 and 6.28.0-2 to produce 6.28.0-2+rpi1

diff --cc debian/changelog
index ad8f4d12c8d90a35a4f96c19a2f79b686ae5f708,4d46acf1aa48449a541559c2b313713f1cfee8fe..5588684cd2fabcf6dc6a3a008da6d42e431d9615
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,34 +1,42 @@@
- kf6-kcoreaddons (6.26.0-2+rpi1) forky-staging; urgency=medium
++kf6-kcoreaddons (6.28.0-2+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 6.20.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 21 Jan 2026 07:15:47 +0000]
 +  * Disable testsuite.
 +  * Update symbols file for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 09 Jul 2026 23:19:48 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 12 Sep 2026 13:26:59 +0000
++
+ kf6-kcoreaddons (6.28.0-2) unstable; urgency=medium
+ 
+   [ Aurélien COUDERC ]
+   * Re-upload merging changes from 6.26.0-3 that were missing from the
+     previous upload.
+ 
+  -- Aurélien COUDERC <coucouf@debian.org>  Sun, 02 Aug 2026 01:38:11 +0200
+ 
+ kf6-kcoreaddons (6.28.0-1) unstable; urgency=medium
+ 
+   [ Aurélien COUDERC ]
+   * New upstream release (6.28.0).
+   * Drop patches applied upstream.
+   * Update build-deps and deps with the info from cmake.
+   * Normalize watch files for KDE Frameworks.
+   * Refresh upstream metadata.
+   * Update the list of installed files.
+ 
+  -- Aurélien COUDERC <coucouf@debian.org>  Tue, 14 Jul 2026 23:15:15 +0200
+ 
+ kf6-kcoreaddons (6.26.0-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Run the test suite in serial (not parallel) mode, as there are few tests
+     (related to KNetworkMounts) try to create/remove the same file.
+   * Upgrade upstream signing key to new packet format.
+   * Set LANG=C.UTF-8 LC_ALL=C.UTF-8 when running the test suite: in case $LANG
+     is set to "C", QSystemLocale (used internally by QLocale) does not check
+     $LANGUAGE, which is what KPluginMetaDataTest overrides.
+ 
+  -- Pino Toscano <pino@debian.org>  Sat, 25 Jul 2026 06:42:18 +0200
  
  kf6-kcoreaddons (6.26.0-2) unstable; urgency=medium
  

diff --cc debian/rules
index e88f464915d049d797e641ba892a48b0d999ebeb,b551c58c5211bdbceee327eb63efc5bc8182ec5f..0ec3f12d603dc14b17991e2ddf72091aa7ab87c4
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -9,4 -9,4 +9,4 @@@ override_dh_auto_configure
        dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_PYTHON_BINDINGS=OFF
  
  override_dh_auto_test:
-       #xvfb-run -a dh_auto_test
 -      LANG=C.UTF-8 LC_ALL=C.UTF-8 xvfb-run -a dh_auto_test --no-parallel
++      #LANG=C.UTF-8 LC_ALL=C.UTF-8 xvfb-run -a dh_auto_test --no-parallel